Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 16 May 2011 05:35:30 +0000 (22:35 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 16 May 2011 05:35:30 +0000 (22:35 -0700)
commit823d4a82e48aecb59bbf87500af3d1f6044b4b69
tree0aa8b57e049a32de7b48822c3e63e1af85439373
parent24b708a89d8dfab5c8a7aadda0f0f62280068633
parent0d78d39301dfc16f6e516e989a2c76a2135d5ece
Merge from mainline.